create a script to create a module file by dietmarkuehl · Pull Request #203 · bemanproject/execution

dietmarkuehl · 2026-01-28T10:05:42Z

The current code structure isn’t particular friendly to modules. Since the relevant file follow a certain structure it is easy to transform the code and create a file which is friendly modules. This is what bin/mk-module.py does. Currently the result is checked in as stc/beman/exectution/execution.cppm.

This PR makes lots of changes to bring make the structure actually consistent, adding a macro to expand to export where appropriate, etc.

…file

Copilot

Pull request overview

This PR introduces infrastructure to generate a C++20 module interface for beman.execution and refactors the library/test code to better support module-based consumption.

Changes:

Add bin/mk-module.py to generate a beman.execution module interface from the existing header structure.
Annotate public API surface with BEMAN_EXECUTION_EXPORT and adjust headers to support module export generation (plus include-guard/comment cleanups).
Update tests (and some examples/docs/build config) to optionally use import beman.execution; instead of including headers.

Reviewed changes

Copilot reviewed 246 out of 249 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
tests/beman/execution/stoptoken-never-general.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stoptoken-mem.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stoptoken-inplace-members.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stoptoken-inplace-general.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stoptoken-general.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopsource-mem.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopsource-inplace-mem.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopsource-inplace-cons.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopsource-general.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopsource-cons.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopcallback.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopcallback-inplace.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopcallback-inplace-general.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopcallback-inplace-cons.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopcallback-general.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stopcallback-cons.test.cpp	Add conditional module import vs header include.
tests/beman/execution/stop-token-module.test.cpp	Switch to `import beman.execution;` for module-specific test.
tests/beman/execution/issue-186.test.cpp	Add conditional module import vs header include.
tests/beman/execution/issue-174.test.cpp	Add conditional module import vs header include.
tests/beman/execution/issue-144.test.cpp	Add conditional module import vs header include.
tests/beman/execution/include/test/stop_token.hpp	Add conditional module import vs header include for test helper header.
tests/beman/execution/include/test/execution.hpp	Adjust test namespace aliases and add `use_type`/`use_template` helpers.
tests/beman/execution/functional-syn.test.cpp	Update references from `test_std::detail` to `test_detail`.
tests/beman/execution/function-objects.test.cpp	Add conditional module import vs header include.
tests/beman/execution/execution-queryable-concept.test.cpp	Update references from `test_std::detail` to `test_detail`.
tests/beman/execution/execution-module.test.cpp	Switch module test to `import beman.execution;` and align aliases to `test_std`.
tests/beman/execution/exec-with-awaitable-senders.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-when-all.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-then.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-starts-on.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-split.test.cpp	Update detail-type references to use `test_detail`.
tests/beman/execution/exec-spawn-future.test.cpp	Update detail-type references to use `test_detail`.
tests/beman/execution/exec-snd-transform.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-snd-expos.test.cpp	Update `queryable` references to use `test_detail`.
tests/beman/execution/exec-snd-apply.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-set-value.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-set-stopped.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-set-error.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-scope-simple-counting.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-scope-counting.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-scope-concepts.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-schedule.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-schedule-from.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-sched.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-run-loop-types.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-run-loop-general.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-recv.test.cpp	Update references from `test_std::detail` to `test_detail`.
tests/beman/execution/exec-read-env.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-prop.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-opstate.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-opstate-start.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-on.test.cpp	Simplify construction using `test_detail::product_type`.
tests/beman/execution/exec-let.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-just.test.cpp	Update detail-type references to use `test_detail`.
tests/beman/execution/exec-into-variant.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-getcomplsigs.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-get-stop-token.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-get-scheduler.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-get-env.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-get-domain.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-get-delegation-scheduler.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-get-compl-sched.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-fwd-env.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-env.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-connect.test.cpp	Update detail-type references to use `test_detail`.
tests/beman/execution/exec-bulk.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-awaitable.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-associate.test.cpp	Add conditional module import vs header include.
tests/beman/execution/exec-affine-on.test.cpp	Add conditional module import vs header include.
tests/beman/execution/CMakeLists.txt	Adjust test list and attempt to wire module build definitions.
include/beman/execution26/stop_token.hpp	Normalize include guards and add trailing `#endif` comment.
include/beman/execution26/execution.hpp	Normalize include guards and add trailing `#endif` comment.
include/beman/execution/stop_token.hpp	Add trailing `#endif` comment.
include/beman/execution/functional.hpp	Add trailing `#endif` comment.
include/beman/execution/execution.hpp	Include `split.hpp` and add trailing `#endif` comment.
include/beman/execution/detail/common.hpp	Introduce `BEMAN_EXECUTION_EXPORT` marker macro.
include/beman/execution/detail/write_env.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/with_awaitable_senders.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/with_await_transform.hpp	Include `common.hpp`.
include/beman/execution/detail/when_all_with_variant.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/when_all.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/value_types_of_t.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/error_types_of_t.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/transform_sender.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/then.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/sync_wait.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/start.hpp	Mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/split.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/schedule.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/connect.hpp	Include `common.hpp` and export `connect` CPO via `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/as_awaitable.hpp	Include `common.hpp` and mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/forwarding_query.hpp	Mark API with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/get_* (multiple)	Include `common.hpp` and mark CPOs/types with `BEMAN_EXECUTION_EXPORT`.
include/beman/execution/detail/* (many others)	Include `common.hpp`, add `BEMAN_EXECUTION_EXPORT` to exported surface, and normalize `#endif` comments.
examples/allocator.cpp	Use exported `ex::write_env` instead of `ex::detail::write_env`.
docs/code/CMakeLists.txt	Comment out module example build wiring.
bin/mk-module.py	New script to generate a module interface file from headers and `BEMAN_EXECUTION_EXPORT` markers.
Makefile	Enable `CMAKE_CXX_SCAN_FOR_MODULES`.
.gitignore	Ignore `gcm.cache`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

tests/beman/execution/CMakeLists.txt

tests/beman/execution/stopcallback.test.cpp

tests/beman/execution/stopcallback-inplace.test.cpp

tests/beman/execution/function-objects.test.cpp

coveralls · 2026-01-28T10:53:04Z

coverage: 93.711% (+1.1%) from 92.63%
when pulling 22e2f9b on mk-module
into a098f90 on main.

* Quickfix to make it work with g++-15 on OSX * Disable CI test with clang++ and libstd++ * Use GenerateExportHeader cmake module

ClausKlein · 2026-01-28T22:13:48Z

@dietmarkuehl I was still working to make CI happy.

[17/173] Building CXX object src/beman/execution/CMakeFiles/execution_headers_verify_interface_header_sets.dir/Release/execution_headers_verify_interface_header_sets/beman/execution/detail/associate.hpp.cxx.o
FAILED: [code=1] src/beman/execution/CMakeFiles/execution_headers_verify_interface_header_sets.dir/Release/execution_headers_verify_interface_header_sets/beman/execution/detail/associate.hpp.cxx.o 
/usr/sbin/g++ -DCMAKE_INTDIR=\"Release\" -I/__w/execution/execution/include -x c++ -O3  -O3 -DNDEBUG -std=gnu++23 -MD -MT src/beman/execution/CMakeFiles/execution_headers_verify_interface_header_sets.dir/Release/execution_headers_verify_interface_header_sets/beman/execution/detail/associate.hpp.cxx.o -MF src/beman/execution/CMakeFiles/execution_headers_verify_interface_header_sets.dir/Release/execution_headers_verify_interface_header_sets/beman/execution/detail/associate.hpp.cxx.o.d -o src/beman/execution/CMakeFiles/execution_headers_verify_interface_header_sets.dir/Release/execution_headers_verify_interface_header_sets/beman/execution/detail/associate.hpp.cxx.o -c /__w/execution/execution/build/src/beman/execution/execution_headers_verify_interface_header_sets/beman/execution/detail/associate.hpp.cxx
In file included from /__w/execution/execution/build/src/beman/execution/execution_headers_verify_interface_header_sets/beman/execution/detail/associate.hpp.cxx:2:
/__w/execution/execution/include/beman/execution/detail/associate.hpp:90:38: error: 'nothrow_callable' is not a member of 'beman::execution::detail'
   90 |                   execution::detail::nothrow_callable<::beman::execution::connect_t,
      |                                      ^~~~~~~~~~~~~~~~
/__w/execution/execution/include/beman/execution/detail/associate.hpp:92:55: error: wrong number of template arguments (3, should be 1)
   92 |                                                       Receiver>> {};
      |                                                       ^~~~~~~~
In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/concepts:44,
                 from /__w/execution/execution/include/beman/execution/detail/queryable.hpp:8,
                 from /__w/execution/execution/include/beman/execution/detail/env.hpp:9,
                 from /__w/execution/execution/include/beman/execution/detail/sender.hpp:8,
                 from /__w/execution/execution/include/beman/execution/detail/scope_token.hpp:8,
                 from /__w/execution/execution/include/beman/execution/detail/associate.hpp:8:
/usr/lib/gcc/x86_64-pc-linux-gnu/13/include/g++-v13/type_traits:98:11: note: provided for 'template<bool __v> using std::bool_constant = std::integral_constant<bool, __v>'
   98 |     using bool_constant = integral_constant<bool, __v>;
      |           ^~~~~~~~~~~~~
/__w/execution/execution/include/beman/execution/detail/associate.hpp:92:63: error: expected '{' before '>' token
   92 |                                                       Receiver>> {};
      |

…breaking other things)

dietmarkuehl · 2026-01-28T22:29:52Z

@dietmarkuehl I was still working to make CI happy.

It didn't seem to be a draft! ... and I think my version was also unhappy.

* Install header only library and cxx_module lib Prevent build errors with appleclang too * Fix: APPLE with clang++ still needs to export CXX=clang++ Quickfix: use import beman.execution; Show #warning if __cpp_modules is not set right Quickfix: do not compile examles/modules.cpp yet * Add find-package-test and fix typos

* Cleanup and use BEMAN_HAS_MODULES in code * Quickfix to compile all tests for now

* Feat: configure project to test without modules * Use beman-install-library-config.cmake * Fix installation without cxx_modules * Add support for CMAKE_SKIP_INSTALL_RULES * The final cleanup

dietmarkuehl added 6 commits January 27, 2026 00:04

normalized headers and started to create a script to create a module …

a071aa1

…file

added macroized export declaration

2f941f6

a first version apparently importing modules

5e5ff2f

replace config.hpp by common.hpp

72901b8

chnaged the tests to prefer module use

42e10d3

actually use the module definitions

f588bdd

dietmarkuehl requested review from camio and neatudarius as code owners January 28, 2026 10:05

Copilot AI review requested due to automatic review settings January 28, 2026 10:05

Copilot started reviewing on behalf of dietmarkuehl January 28, 2026 10:06 View session

Copilot AI reviewed Jan 28, 2026

View reviewed changes

Add nothrow_callable include to associate.hpp

3fe7e19

Quickfix to make it work with g++-15 on OSX (#204)

f9d198c

* Quickfix to make it work with g++-15 on OSX * Disable CI test with clang++ and libstd++ * Use GenerateExportHeader cmake module

meddled a bit with Makefile to be able to compile (hopefully without …

6a7ce69

…breaking other things)

dietmarkuehl and others added 10 commits January 28, 2026 23:48

fixed a bunch of issues when using import std;

1087581

fix some CI feedback

66eb032

added a banner to mk-module.py

e2f114b

added a banner to mk-module.py

29e4886

moved changes from the generated file into suitable locations

03b2cf1

addressed various issues discovered by CI

f59fbc6

fixed more compilation issues detected by CI

75125a0

fixed more CI errors

0056389

fixed another compilation error

6b58928

This was referenced Jan 30, 2026

Feat: Prepare CXX_MODULES tests #195

Closed

The cmake workflow preset "appleclang-release" failes on OSX? #153

Closed

macOS with g++-14: Error: ld: library 'asan' not found #71

Closed

ClausKlein and others added 6 commits January 30, 2026 13:00

Cleanup and use BEMAN_HAS_MODULES in code (#206)

69e8036

* Cleanup and use BEMAN_HAS_MODULES in code * Quickfix to compile all tests for now

enhanced mk-module.py to track source locations properly

b33d446

fixed a few formatting issues and moved "module" to the top

964deb0

some formatting issues

a243486

fixing another python formatting error

55b34ea

Feature/fix build without modules (#208)

22e2f9b

* Feat: configure project to test without modules * Use beman-install-library-config.cmake * Fix installation without cxx_modules * Add support for CMAKE_SKIP_INSTALL_RULES * The final cleanup

dietmarkuehl merged commit f72d370 into main Jan 31, 2026
32 checks passed

dietmarkuehl deleted the mk-module branch January 31, 2026 23:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

create a script to create a module file#203

create a script to create a module file#203
dietmarkuehl merged 25 commits intomainfrom
mk-module

dietmarkuehl commented Jan 28, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

coveralls commented Jan 28, 2026 •

edited

Loading

Uh oh!

ClausKlein commented Jan 28, 2026

Uh oh!

dietmarkuehl commented Jan 28, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

dietmarkuehl commented Jan 28, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

coveralls commented Jan 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ClausKlein commented Jan 28, 2026

Uh oh!

dietmarkuehl commented Jan 28, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

coveralls commented Jan 28, 2026 •

edited

Loading